bitkeeper revision 1.1331 (42662daawcgGfsYXrl37riGl22RhdA)

[PATCH] [PATCH 1/2] i386 whitespace cleanup in Linux sparse tree

Eliminate extraneous whitespace changes in i386 portion of Linux
sparse patch.

Signed-off-by: Chris Wright <chrisw@osdl.org>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
index fac0ad6ba9747866fae70688758d8ae043686232..a6416ed5ed6154bed42075f62dc97aa1c30c754a 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
@@ -457,22 +457,22 @@ config PREEMPT_BKL
 #         enters thermal throttling.
 
 config MICROCODE
-        tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
+       tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
         depends on XEN_PRIVILEGED_GUEST
-        ---help---
-          If you say Y here and also to "/dev file system support" in the
-          'File systems' section, you will be able to update the microcode on
-          Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
-          Pentium III, Pentium 4, Xeon etc.  You will obviously need the
-          actual microcode binary data itself which is not shipped with the
-          Linux kernel.
-
-          For latest news and information on obtaining all the required
-          ingredients for this driver, check:
-          <http://www.urbanmyth.org/microcode/>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called microcode.
+       ---help---
+         If you say Y here and also to "/dev file system support" in the
+         'File systems' section, you will be able to update the microcode on
+         Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II,
+         Pentium III, Pentium 4, Xeon etc.  You will obviously need the
+         actual microcode binary data itself which is not shipped with the
+         Linux kernel.
+
+         For latest news and information on obtaining all the required
+         ingredients for this driver, check:
+         <http://www.urbanmyth.org/microcode/>.
+
+         To compile this driver as a module, choose M here: the
+         module will be called microcode.
 
 #config X86_MSR
 #       tristate "/dev/cpu/*/msr - Model-specific register support"

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
index e1414fee8cdd33a816cc2e287341ddde0750a73b..3dc5ed10a629949e2005f4e7b6c6aef429133b2e 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
@@ -600,7 +600,7 @@ void __init cpu_init (void)
         * Set up the per-thread TLS descriptor cache:
         */
        memcpy(thread->tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN],
-           GDT_ENTRY_TLS_ENTRIES * 8);
+               GDT_ENTRY_TLS_ENTRIES * 8);
 
        cpu_gdt_init(&cpu_gdt_descr[cpu]);
 

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
index 74b14017bff205add7ffa9229bbc0230fc8076db..04afb41017de96f41efffbdac51c61432a068b1f 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
@@ -67,10 +67,10 @@ checkCPUtype:
 
        incb ready
 
-       xorl %eax,%eax          # Clear FS/GS and LDT
+       xorl %eax,%eax                  # Clear FS/GS and LDT
        movl %eax,%fs
        movl %eax,%gs
-       cld             # gcc2 wants the direction flag cleared at all times
+       cld                     # gcc2 wants the direction flag cleared at all times
 
 #ifdef CONFIG_SMP
        movb ready, %cl 

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
index 1947e910ef13e4cf7bf883310af115ebc1898604..d3a3e08598e888bbff4a357809fd6f2549bc1db9 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
@@ -266,7 +266,7 @@ static unsigned long cpu_khz_ref = 0;
 
 static int
 time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
-                     void *data)
+                      void *data)
 {
        struct cpufreq_freqs *freq = data;
 
@@ -338,7 +338,7 @@ static int init_tsc(char* override)
 
        /* (10^6 * 2^32) / cpu_hz = (10^3 * 2^32) / cpu_khz =
           (2^32 * 1 / (clocks/us)) */
-       {       
+       {
                unsigned long eax=0, edx=1000;
                __asm__("divl %2"
                    :"=a" (fast_gettimeoffset_quotient), "=d" (edx)

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c
index 0cac0f30c37f7a70412103e5a4e0d8619f48843b..99e2cccc403617eb3ee83329b3230640a284781e 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c
@@ -229,10 +229,10 @@ fastcall void do_page_fault(struct pt_regs *regs, unsigned long error_code,
        error_code |= (regs->xcs & 2) << 1;
        if (regs->eflags & X86_EFLAGS_VM)
                error_code |= 4;
-               
-       if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
-                                       SIGSEGV) == NOTIFY_STOP)
-               return;
+
+       if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
+                                       SIGSEGV) == NOTIFY_STOP)
+               return;
 #if 0
        /* It's safe to allow irq's after cr2 has been saved */
        if (regs->eflags & (X86_EFLAGS_IF|VM_MASK))

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c
index de51b01855e807b0c1dd5eba9e5898571f769214..88c6692a9a7b4297bbd7dab11de0925edb5f181f 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c
@@ -71,13 +71,11 @@ struct pci_raw_ops pci_direct_xen = {
        .write =        pci_conf_write,
 };
 
-
 static int __init pci_direct_init(void)
 {
-
-        printk(KERN_INFO "PCI: Using configuration type Xen\n");
-        raw_pci_ops = &pci_direct_xen;
-        return 0;
+       printk(KERN_INFO "PCI: Using configuration type Xen\n");
+       raw_pci_ops = &pci_direct_xen;
+       return 0;
 }
 
 arch_initcall(pci_direct_init);

diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c
index 3a5b7477a37fd327a18d5523208752fdebd45c54..816d439b2c925940a9f9f048614fc9bddd5763c6 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c
@@ -93,7 +93,7 @@ void pcibios_penalize_isa_irq(int irq)
 static int pirq_enable_irq(struct pci_dev *dev)
 {
        int err;
-       u8  pin;
+       u8 pin;
        physdev_op_t op;
 
        /* Inform Xen that we are going to use this device. */